auto merge of #568 : mbrubeck/cargo/dist-fix, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 11 Sep 2014 23:43:55 +0000 (23:43 +0000)
committerbors <bors@rust-lang.org>
Thu, 11 Sep 2014 23:43:55 +0000 (23:43 +0000)
Fixes a regression from #559.


Trivial merge